Merge "Fix ahat test"