minor system test cleanups
Merge pull request #106 from jhoblitt/system_test_cleanups

minor system test cleanups