No Bug - fix regression on tests.
Merge pull request #461 from humphd/fix-test-bustage

No Bug - fix regression on tests.