Add a unit test for the fix for TRQ-2224.