This and the subsequent changes aren't really necessary--they're just tests so it's fine to override the classes.