Get rid of TestCaseDecorator