Bug 946533 - [Rocketbar] Follow-up, update tests