More work on collections, tests in progress