Change tests to funsuite