Fix for failed tests.