Redundant block inspection refactored, check for next $ added
tests fixed: use actual class renderer to get class names