Getting close. Down to 9 test failures.