Aligned all shapes to a consistent area
Updated test docs to reflect recent changes