Fix test / cs fixes