Cleaned up struct chnages so that the intended code execute for the expected ruby version. That also fixed the Range test.