Repackage and added test