Reorganize collection tests a bit