cs + test fix