Added all of the wrappers and tests