Make tests to comply with new cse (WIP)