Fixes #2051. (At least this is the last commit into branch
2015-ShapesAsDivs before merging into master) Includes additions to test
plan to test out the new features.