Fix in system_test