Add tests for Collections. Refactor tests