US668 - Fix broken tests (again)