Cleaning up a couple more tests.
Merge pull request #1323 from scottsds/other_test_fixes

Cleaning up a couple more tests.