DRY up http tests some more