Added tests for the new collections stuff