Bugs found with mocks