Cleaned Commons HttpClient out of tests in merged modules