One more attempt to fix failed tests