Checkpoint: more tests passing with fix for test mocks.