fixed failing test
regrouped dependencies