Fixing issue with test refactoring.
Merge pull request #177 from spankyj/master

Fixing issue with test refactoring.