Fix CS
Update CHANGELOG
Fix tests