Revert "separate server and the httpclient test"

This reverts commit e9a45a327c9dfe6c5409bc6dd6ca1ee5c4c92259.