Simplify test cases