Modify various shapes test case resolution.