Fixed tests & progress on dependecies collection.