Modified tests to account for new aodaac behaviour