Fix dependencies and added new test