Corrected dependencies and test requirementsz