updated with feedback from @betravis
Merge pull request #486 from rhauck/shapes-test-plan

updated with feedback from @betravis