Fix for failed tests