Make to initialize Collections
Fix a test