Updated heuristics
Added heuristics tests