Add 2-argument aok(id|data, test) syntax based on #1