Move text test to correct location
Simplify tests