Update bootstrap tests
Update logical structure
Upgrade Collection class and tests case