Changed CollectionServiceTest (not finished)