subject stuff?
Merge pull request #19 from salamanders-2014/addTestsForResources

subject stuff?