Address more review comments.
Fix skip message.
lint
Merge pull request #182 from ClusterHQ/fix-tests-on-vagrant-111

Missing review fixes from #173.