RepositoryTest updated and enhanced