Clean up test code to make it more consistent

@rev tbliss@
Merging origin/goliver/master-pending-test-cleanup into master