tests passing with refactored module