simplify tests a bit