Added more mocking tests