[Bug 3606542]: Add missing constraint to test.
[Bug 3606542]: Add missing constraint to test.
[Bug 3606397]: Make test work in isolation, and corrected what was being tested.
 merge trunk: