Removed globals from unit tests and cleaned up the tests
Merge pull request #79 from Katahdin/master

Cleaned up tests