Fix CS errors
Fix failing tests