Refactor systest to be simpler.