diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 77533aab..25b1156d 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -11,9 +11,9 @@ jobs:
 
     strategy:
       fail-fast: false
-      max-parallel: 2
+      max-parallel: 4
       matrix:
-        node-version: [14, 16]
+        node-version: [14, 16, 18]
 
     steps:
     - uses: actions/checkout@v2
@@ -26,14 +26,14 @@ jobs:
     - name: Install Dependencies
       run: yarn install
 
-    - name: Build
-      run: yarn build:prod
+    - name: Build Node
+      run: yarn build && yarn build:prod
 
     - name: Run Node Tests
       run: yarn test:node
 
     - name: Run Browser Tests
-      run: yarn test:browser
+      run: yarn build:browser:prod && yarn test:browser
 
     - name: Run Linter
       run: yarn tslint
diff --git a/Makefile b/Makefile
index 9acd407c..da7dda11 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-XDR_BASE_URL_CURR=https://github.com/stellar/stellar-core/raw/master/src/protocol-curr/xdr
+XDR_BASE_URL_CURR=https://github.com/stellar/stellar-xdr/raw/curr
 XDR_BASE_LOCAL_CURR=xdr/curr
 XDR_FILES_CURR= \
 	Stellar-SCP.x \
@@ -9,7 +9,7 @@ XDR_FILES_CURR= \
 	Stellar-types.x
 XDR_FILES_LOCAL_CURR=$(addprefix xdr/curr/,$(XDR_FILES_CURR))
 
-XDR_BASE_URL_NEXT=https://github.com/stellar/stellar-xdr-next/raw/main
+XDR_BASE_URL_NEXT=https://github.com/stellar/stellar-xdr/raw/next
 XDR_BASE_LOCAL_NEXT=xdr/next
 XDR_FILES_NEXT= \
 	Stellar-SCP.x \
diff --git a/package.json b/package.json
index d1ff7c60..471b83eb 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
     "test:all": "yarn test && yarn test:browser && yarn tslint",
     "docs": "jsdoc -c ./config/.jsdoc.json --verbose",
     "tslint": "dtslint --localTs node_modules/typescript/lib types/",
-    "preversion": "yarn clean && yarn pretty && yarn build:all && yarn test:all",
+    "preversion": "yarn clean && yarn pretty && yarn build:all:prod && yarn test:all",
     "pretty": "prettier --config ./config/prettier.config.js --ignore-path ./config/.prettierignore --write './**/*.js'",
     "clean": "rm -rf lib/ dist/ coverage/ .nyc_output/"
   },