Fixes for registering Collections
Updated unit tests