Fixing some of the failed tests.