Resolves issue resolving dependencies and fixes unit tests