Added fixtures and mocks