Fix dependencies and test