Tidy up
Add integration tests for Http