Using joe for dynamic tests.
Cleaning up semicolons and tabs/spaces.
Merge pull request #5 from jakeorr/master

Incorporating 'joe' for dynamic tests. Testing each shape separately.