-Changed collection parameterized creators to be created only when needed
-Fixed tests