Bug 959694 - Follow-up. Unit test fixes.
Merge pull request #4 from KevinGrandon/benfrancis-959694-rocketbar

Bug 959694 - Follow-up. Unit test fixes.