minor changes to dependencies and functional test setup