Minor CS fixes
Tests added