refactoring test and code
adapt server script (rename headers)