removed unnecessary dependencies, duplicated tests