simplify tests some more