Fixed dependencies and test passing