Fix CSIT tests and add some more