New test updates, includes AOD tests