revert collection_* methods, add slim tests, fix other tests