CS cleanup
Added test for getting/setting the mode