improvement to the system test