Simplify failing tests