ART-1141 Oops... fix failing tests