Simplify test case a bit