Refactoring to support multiple tests/spec directories