Extended and fixed the aom testcases.