Updated dependencies
Updated tests