ADEN-607 More updates to test