typo
moved make_paras_and_func to wrap.py, added alternate (better??) wrap_function()
updated tests