Simplify tests for older test/unit