Updated tests, fixed issue with package