Merge tests with deep-collection branch for comparison