DEV: Intermediate commit for wrap_lib corrections and tests