More modification of systems tests, almost done