Test plugin fixes
Merge pull request #19 from mdrillin/testFixes

Test plugin fixes