Added second set of edge heuristics
An attempt to check for more invalid states
Move test input files to their own directory