Modified tests with the mocks