#US113 fixes and changes test