more tests passing with refactored core module