Fixed all but one test to use new classes.