Updated old class references so tests pass.