ADEN-1372 Unit test update