Add heuristic testing