US632 - fix broken tests