Refactored test resources
Merge pull request #31 from wmde/testsrefactoring

Refactored test resources