some changes for mocking repository