Merge "Fix various test dependencies."