minor system test cleanups

dependent on #105