Fixing failed tests