Bug 931152 [v1.2] Added missing tests from master.