Bug 1030285 - Fixed tests