Merge "Renumber test 988-redefine-use-after-free to 998"