some tests
Merge remote-tracking branch 'origin/feature/collections' into feature/collections