REV: clean up the test codes