Minor test tweaks
Merge pull request #883 from rackerlabs/test-tweaks

Minor test tweaks