Fix cs
Fix tests