Update shape tests to fix errors and for feedback.