Fixes to the auto test framework.