re-organising mocks and fixtures