Lint
Fixed cmake
Added better CSMS tests