Bug 907459 - Fixing tests