DEV: Finished mods to wrap_lib.py.  Test funcs in progress
DEV: Rem wrap_lib tests to separate branch so only wrap_lib has changes

Finished incorporating all comments posted to old PR on github