Convert additional classes to EntityTestCase.