Fixed state ordering in test systems and conversion from 3D to 2D in utils.