Fixing more CS violations and some tests