Add and fix test failures.