Fix Multi-line Blocks

Had a multi-line block that used curly braces.  I made the block use
do..end syntax instead.
DRY Up Duplicated Tests

Refactored some tests to be more DRY.