DRY Up Duplicated Tests

Refactored some tests to be more DRY.