Fixes old broken tests