fixed test names missing _
Added generic cmp helper