Add Closeables to testing module
Remove ApacheHttpClient