Fix builtin test and simplify the classified text tuple.