tests passing after refactoring to just one module