Merge "Split HttpTest and SessionTest to unit and integration"