Move to trace sampler or colouring tests