added class name checks in tests