Updating tests, refining the $wrapper logic