Update structure a tests
Create Collection class and test case
Create Collection class and test case