Adapt tests to new classes.