Fix unit-tests, some CS, and a typo!