Down to line ~7000 in the test file, more fixes.