Fix CS
Finish test coverage