Update

Two new heuristics and additional testing capabilities