WINDUP-377: Fix remaining test cases.