Fix tests, replace Neighbour with direction
Solver included