Put back CSP in SYSTEM_TEST