Simplify tests a bit