Assessing Rigid and Non-Rigid Spatial Thinking. (May 2022)