Fix CS and a controller test
Unit tests