updated shape image + margin + shape-margin test