Make Repository a bit more testable
Replace info tests with mocked tests
Merge branch 'mock-in-tests' into develop