improve collection tests
improve collection tests