simplify tests a ton