move httpclient tests back to original location