Back-port UT for fix as well to allow tests

Change-Id: Id1e56e7513b2ddfdd03d93fb424f23ad3ff14c3c