fixes aam tests final errors
Merge remote-tracking branch 'nontas/tests_fix' into avnew