Updated geom optimise test and a couple of others.