Merge "Remove test dependencies on phony targets."