Fixing up more bugs, according to test file output