Bug 695143 - Fix failing tests introduced by ba6e7ea