Re-enable HTTPSession functionality; fix up tests - all tests pass
Clean up code