Re-instate the TestCase classmap, looks like its needed