Update rc2test to use the test infrastructure