Fixed some bugs and tests in Dependencies