Fix CS, add proxy assertion and improve test running condition