Fix resource types
Merge pull request #3 from alecsammon/fix_traits

Add additional tests for fix resource types