code cleanup
fixed test, removed unnecessary overrides
moved dijkstra to proper package (and killed stupid typo)