Updated package and test