adding some code to allow all systems tests to be run in sequence
replacing old test with two new tests