Update mdc2test to use the test infrastructure