cs fixes
tests