Fix the waits.
Merge pull request #911 from rackerlabs/fix-config-tests

Fix the waits.