simplify test organization
force_text to fix some python 2 errors