US471 - Fix broken tests