Unit test for ADEN-1265 fix