Bug 912494 - (part 3: follow changes mainly on test)