Rename things to avoid "TestTests".
Add MRC support and passing tests.