Refactoring the test directory and starting on tests for the include http client wrapper.