Correct dependencies... those about tests are a mess