Changed order of shapes when reading from bin and xml document. Small correction of test case for issue CR28425