Added tests for new heuristics