Merge "Improve the dependency declaration for Net tests"