fix cs and add few more tests