Removed references to TestClasses