Fix tests
Fix CS