Support multiple system tests

The test framework had a few bugs preventing multiple system tests from running.