Not reviewed - test case fixes.