Fixing failing test case
Fixed CS errors