Added a bunch of check expects to the heuristic functions.