fixed dependency and tests