fixed CS
fixed some tests