Correcting package flubs
Fixing tests
Merge pull request #1196 from rackerlabs/package-flubs

Correcting package flubs