Fix some failing tests by adapting them to level changes and better aged alligator removal