Fixed broken tests;
Merge pull request #37 from jfwood/verify-resource

Fixed broken tests and broken cli code;