Refactor the HTTP host test and improve the data format