Organize UTs-add expected_aur