refactored tests and cleaned up resources
Merge pull request #7 from vforgione/resource-test-updates

refactored tests and cleaned up resources