Rearranged the units so that only the Shapes Test cases fail initially.

As and when the test cases are passed, the .cpp.bak files can be renamed to .cpp files.