A bunch of fixes in system test.
Fix a bunch of problems with system test.
Merge branch 'garth/fix-system-test'