Convert a few more tests to be able to use cxxsim