Add a couple more collection allowing better testing
Fix unit-tests due to these addition of collections
More unit-tests