Simplify tests even more