Fix: dependencies
Add: a few functional tests