refactored to use new "tests" convention