Adding collection for versions, mocks and cleaning wrong path for unit tests