Fixed tests and added stream to CollectionSync