TODO added
Additional tests
Updated dependencies