Some work on the hexagon unit tests