Improve tests for OP_ID