Updated dependencies
Added unit tests