Added tests for contrib.http
Cleaned up a little bit