Simplify tests slightly