diff --git a/tests/sharding-e2e-test.sh b/tests/sharding-e2e-test.sh
index 700f4ad2a..7e7e0c694 100755
--- a/tests/sharding-e2e-test.sh
+++ b/tests/sharding-e2e-test.sh
@@ -25,14 +25,12 @@ echo "Installing createtree..."
 go install github.com/google/trillian/cmd/createtree@latest
 
 echo "starting services"
-docker-compose up -d
+docker-compose up -d --build
 rm ~/.rekor/state.json || true
 
-echo "building CLI and server"
+echo "building CLI"
 go build -o rekor-cli ./cmd/rekor-cli
 REKOR_CLI=$(pwd)/rekor-cli
-go build -o rekor-server ./cmd/rekor-server
-
 
 function check_log_index () {
   logIndex=$1
@@ -94,7 +92,7 @@ function collectLogsOnFailure () {
     fi
     exit 0
 }
-trap "collectLogsOnFailure $?" EXIT
+trap "collectLogsOnFailure \$?" EXIT
 
 echo "Waiting for rekor server to come up..."
 waitForRekorServer
@@ -265,13 +263,13 @@ NUM_ELEMENTS=$(curl -f -H "Content-Type: application/json" --data '{"logIndexes"
 stringsMatch $NUM_ELEMENTS "2"
 
 # Make sure we get the expected LogIndex in the response when calling /retrieve endpoint
-RETRIEVE_LOGINDEX1=$(curl -f http://localhost:3000/api/v1/log/entries/retrieve -H "Content-Type: application/json" -H "Accept: application/json" -d "{ \"logIndexes\": [1]}" | jq '.[0]' | jq  -r .$UUID1.logIndex)
+RETRIEVE_LOGINDEX1=$(curl -f http://localhost:3000/api/v1/log/entries/retrieve -H "Content-Type: application/json" -H "Accept: application/json" -d "{ \"logIndexes\": [1]}" | jq '.[0]' | jq -r "with_entries(select(.key|test(\"^"$ENTRY_ID_1"$\"))) | .[].logIndex")
 stringsMatch $RETRIEVE_LOGINDEX1 "1"
 
 # Make sure that verification succeeds via UUID
 echo
 echo "Testing rekor-cli verification via UUID..."
-$REKOR_CLI verify --uuid $UUID1 --rekor_server http://localhost:3000
+$REKOR_CLI verify --uuid $ENTRY_ID_1 --rekor_server http://localhost:3000
 
 # Make sure that verification succeeds via Entry ID (Tree ID in hex + UUID)
 echo
diff --git a/tests/test_file.sig b/tests/test_file.sig
new file mode 100644
index 000000000..3adcf93a1
Binary files /dev/null and b/tests/test_file.sig differ
diff --git a/tests/test_file.txt b/tests/test_file.txt
new file mode 100644
index 000000000..0e3da20d1
--- /dev/null
+++ b/tests/test_file.txt
@@ -0,0 +1 @@
+hello rekor
diff --git a/tests/test_public_key.key b/tests/test_public_key.key
new file mode 100644
index 000000000..2d24cebd8
--- /dev/null
+++ b/tests/test_public_key.key
@@ -0,0 +1,41 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGNBF+cIM0BDACa8G7RD2v3miwMtxVaZi3JBVueVAqHKC4eKoMS5HMCRo+HZVRA
+70XmsTpX1Z1gZQuuC0GDY26hBhejAq3hx2rv6/8q90BvWGH9tVeGpL1saIm52gER
+XyVggz5kAC0S6vMn7dr2etBkWWP+Oj05S02YZBTYgxpObyecUScqKNTjslZQBH2d
+SHuk3o2Z7hM49U0l7zbWw4oIT+lARcsajQTwWjliaPD/HRjT2nROhIhited/wgyz
+ydIq5e6s18VLcT75qWnrZXNPWFwf25RXY3utkW+GW5nQeN80Q2kREgkxFs5Ad5WZ
+vE7t8/hx5zmslZ4tfF4si3QZeIQBacYbwxMPSDf9oFGxdGFT889wJLGgWmr1TkPM
+cN06wxARGtxN0z61FJTijLWRbjW3unI9hcQcUlN/Q+16otHpeKVg4oW00CrvWOD6
+qkLcMD49yUD8fSGB+REniBa89C9kQU4SKdgsLL/Q+JK+Sy9KmIDrm1a4DfP1psfe
+LjarzsVZfKUHfwcAEQEAAbQiTHVrZSBIaW5kcyA8bGhpbmRzQHByb3Rvbm1haWwu
+Y29tPokB1AQTAQgAPhYhBHIAlFxu/GnY+oRlCSa3waCdOKR6BQJfnCDNAhsDBQkD
+wmcABQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJECa3waCdOKR6Z1kL/1IK0vde
+ZX5r5SebNxTINSAAvYkrKRyJ5f7lOM9gLGIuc2FoNUnjVQT0rIG9019h48pCy91f
+XjDDRMY9gzFWWCgGnXh1hWI3M7BJF6YE6u6DXGsvuUpGrNeZAG6kkazAuAnnV0kC
+08zoRrAZCvlpaZryd8itb+rV+QKp7Aw2lAIH1e6dwM4RLFjvfk8LJXxjJAoPmw6l
+Lw18c7oW6RLO9QXQ8eM6r2vHHpm0TudvZyafNuC32GDlMY4u0V1Db8LsymPsAhuA
+2Jz4/KPq6uKwItmVK4pndfEDu6D1TooDYXiptYafdvU33pUQxwHofTTfE5zZw2Pe
+lH3nZdsgHXGPxJLLMqOpW4C/cM6ZQVgYStVr0nvU66+QjQvskUZR06ddEznBpGJs
+tpmj9Ae/GRY8ENnN9/2GfEurtz3dKNUZojMy153jcG0U1zzh115WJ7t8wHBu4S4p
+0gE+RAqytAcIZDd2NSNrz8Vr9FE9x+fat9ERlbndABE5iV8sK0+FanWwgbkBjQRf
+nCDNAQwAtBothfcRzr3xr3P9p7QCMwKuionvMCm8WgwNS4Cphqo5NOr2iMjkLP0J
+omgJLVX5N+brv8y4H8rYPwKB16o/hA8IbGbpYym3FcykTwcbWbtPTLEtdCUPLYTD
+NC5LGJpg3e86YfQtAN6/MnZyYOmlDx2WGttLdmsASGVux6AVJqIv+x06UKJEmK3t
+jlEVKyg12REzye5IT6qESGpOzo2YlWUqITw/AaPQ2ZxUaxvYFoUOcwgcdnHkgshI
+On9h/NHUmP32WQvqkQMuUaPINRsC83KvTDGlyfSHVFzMa4hDMhEcXz4acind5WTe
+zyLgZhOb7cNeCx4xcrtPB6U7BR/FVLzLBlAzuzjiEhYwJo3AOMqFoR5mAqhlutNO
+ssyofbqTgGbSLdjbXP/aEtgz2MV9n/oc1SB8HeZO/17JygnzruIKy+/lOWOzt+jV
+VFpVyh1ue8lF7ymKR4tsl+iIVbqnPvpMhLOIBqXFn2gMCkGoJLy7OHo2WAEJGlt3
+Swpbrjj1ABEBAAGJAbwEGAEIACYWIQRyAJRcbvxp2PqEZQkmt8GgnTikegUCX5wg
+zQIbDAUJA8JnAAAKCRAmt8GgnTikeiniDACEAfkZq/4Rp2aNA4dboJ7UFXDOaRkV
+9MKoEZFqTMNovDL5xhMlglPPu/l+dhTgxdeJ9EVHoeztb896U/pOuBRsn9VtW4Y/
+jeiW7EyNXAd/OrvnFbx+7iXLqupZJJFTi/j9RhVYNsml7sebTPeBnGDA91qbC4xH
+pQVDCujx69VxO5E1LSohCM+O/5vLBm8i1o/nbFmby7VCyKeRDfhtf9nC84qsE9Gq
+U7/LSik9bfxMWbpq8ykntmS3a0szc4bVFpezBpmNb0AVcB+Tm9gWmEzhiLs6FKAN
+InqNuXuBL9PCac7+mU+c2mBgGORGd1dZO3RC89zF3xBBYnCOe5cAMFlc1XGsllsI
+dzdrdXvbNBz/j71puN8oFYm/XbVcieO0TfQiDcTt8KiiR9TAD9/P593RMlLOGS8p
+hvJbiFoZfXHclsZFHm8DQQa94IZwTB8m4gBV0M2XSvdHo30lsqjtZaZiSrRh4rsh
+n14pbAaTdaKEPcvtufbUuW0IjYd2kpIT/tg=
+=Oghr
+-----END PGP PUBLIC KEY BLOCK-----