STOP THE LINE - i broke some new tests
Merge pull request #670 from rackerlabs/fixtests_ibroke

STOP THE LINE - i broke some new tests