simplify-tests
