DE471 - Fix broken tests