ERP-349
BUGS-1013

Added extra test.