Add comments to test
Add section markers
Cleaner method for creating objects with class