Remove references to some classes from tests