Move sexp_util into src, fixed names in tests