[UPDATE] Add tests, dependencies