Made changes to test_http.py and cleaned up server.py