ADEN-153 long overdue
ADEN-153 enable fixed tests again