Adding tests
hint, tests
More dependencies
Small fix