PEP-8 fixes
fixed merged file problem in http_server.py, pytests