Fix tests

(Finally!)
CS fixes