Removed references from test classes