Fixing dependency and unit test