[System] Fix tests