missing condition in PuzzleCountInvalidHeuristics.java - fixed
and added heuristic cmp test