Hopefully this prevents the address in use? Added todos
Merge pull request #901 from rackerlabs/test-fixes

Fix the pipeline!