fixed dependency, added tests