Cleanup test
Merge branch 'collection-path'