Fix unit test
Fix CS