Add tests for collections