resource tests improved
Merge branch 'master' of https://github.com/ChickenDaddy/server