Cleaned up knightstour and boatmoorings tests