Tidied up mocks in all tests