Backport AHB test changes from Khronos review