Fix some unit tests for deploy
Merge pull request #1000 from kyleknap/deploy-fix

Fix some unit tests for deploy