Some changes in JUnitTests and InMemoryRepositories