Addresses testing issues.
Merge pull request #53 from wbyoung/grant-testing

Addresses testing issues.