trq-2289 Added a unit test for the fix.