SYNR-358: more testing
SYNR-358: more testing