US668 - fix broken tests