Add test cases that were inadvertently omitted from r223783 and r223788