Fixed some failed tests.