Cs/more tests