CS fixes, more tests