quicktest fixes
Fixes after PR Comment
Merge pull request #989 from palantir/fix-quicktests

Quick Test Fixes on develop