Update PR; remove reverse-forced testcase code