Consolidate test dependencies