Removed unused classes
Added tests for fieldsets and collections