Simplify more tests