Fixed failing tests due to state file format change for cuboid derived
geometries