Remove unused tests
Refactor collections list a bit