diff --git a/java/ql/test/experimental/query-tests/quantum/NonceReuse/NonceReuse.expected b/java/ql/test/experimental/query-tests/quantum/NonceReuse/NonceReuse.expected
index 7372722c2f5..38ba6187b59 100644
--- a/java/ql/test/experimental/query-tests/quantum/NonceReuse/NonceReuse.expected
+++ b/java/ql/test/experimental/query-tests/quantum/NonceReuse/NonceReuse.expected
@@ -1,4 +1,4 @@
-| Test.java:47:47:47:52 | Nonce | Reuse with nonce $@ | Test.java:56:47:56:52 | Nonce | Nonce |
-| Test.java:56:47:56:52 | Nonce | Reuse with nonce $@ | Test.java:47:47:47:52 | Nonce | Nonce |
-| Test.java:84:48:84:54 | Nonce | Reuse with nonce $@ | Test.java:90:49:90:55 | Nonce | Nonce |
-| Test.java:90:49:90:55 | Nonce | Reuse with nonce $@ | Test.java:84:48:84:54 | Nonce | Nonce |
+| Test.java:40:47:40:52 | Nonce | Reuse with nonce $@ | Test.java:49:47:49:52 | Nonce | Nonce |
+| Test.java:49:47:49:52 | Nonce | Reuse with nonce $@ | Test.java:40:47:40:52 | Nonce | Nonce |
+| Test.java:76:48:76:54 | Nonce | Reuse with nonce $@ | Test.java:82:49:82:55 | Nonce | Nonce |
+| Test.java:82:49:82:55 | Nonce | Reuse with nonce $@ | Test.java:76:48:76:54 | Nonce | Nonce |
diff --git a/java/ql/test/experimental/query-tests/quantum/NonceReuse/Test.java b/java/ql/test/experimental/query-tests/quantum/NonceReuse/Test.java
index 2f3aab5b6ef..1b65e324275 100644
--- a/java/ql/test/experimental/query-tests/quantum/NonceReuse/Test.java
+++ b/java/ql/test/experimental/query-tests/quantum/NonceReuse/Test.java
@@ -1,46 +1,39 @@
 package com.example.crypto.artifacts;
+
+import java.security.*;
 import javax.crypto.Cipher;
 import javax.crypto.KeyGenerator;
 import javax.crypto.SecretKey;
 import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.GCMParameterSpec;
-import java.security.*;
-import java.util.Base64;
-import java.util.Properties;
-import java.util.Random;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.Arrays;
 
 public class Test {
 
-    public static SecretKey generateAESKey()throws Exception  {
+    public static SecretKey generateAESKey() throws Exception {
         KeyGenerator keyGen = KeyGenerator.getInstance("AES");
         keyGen.init(256);
         return keyGen.generateKey();
     }
 
-   
-    private static byte[] getRandomWrapper1()throws Exception  {
+    private static byte[] getRandomWrapper1() throws Exception {
         byte[] val = new byte[16];
         new SecureRandom().nextBytes(val);
         return val;
     }
 
-    private static byte[] getRandomWrapper2A()throws Exception  {
+    private static byte[] getRandomWrapper2A() throws Exception {
         byte[] val;
-        val =  getRandomWrapper1();
+        val = getRandomWrapper1();
         funcA1(val);
         return val;
     }
 
-    private static byte[] getRandomWrapper2b()throws Exception  {
+    private static byte[] getRandomWrapper2b() throws Exception {
         byte[] val;
-        val =  getRandomWrapper1();
+        val = getRandomWrapper1();
         return val;
     }
 
-    private static void funcA1(byte[] iv)throws Exception {
+    private static void funcA1(byte[] iv) throws Exception {
         IvParameterSpec ivSpec = new IvParameterSpec(iv);
         Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
         SecretKey key = generateAESKey();
@@ -48,7 +41,7 @@ public class Test {
         byte[] ciphertext = cipher.doFinal("Simple Test Data".getBytes());
     }
 
-    private static void funcB1()throws Exception {
+    private static void funcB1() throws Exception {
         byte[] iv = getRandomWrapper2A();
         IvParameterSpec ivSpec = new IvParameterSpec(iv);
         Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
@@ -57,7 +50,7 @@ public class Test {
         byte[] ciphertext = cipher.doFinal("Simple Test Data".getBytes());
     }
 
-    private static void funcA2()throws Exception {
+    private static void funcA2() throws Exception {
         byte[] iv = getRandomWrapper2b();
         IvParameterSpec ivSpec = new IvParameterSpec(iv);
         Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
@@ -66,7 +59,7 @@ public class Test {
         byte[] ciphertext = cipher.doFinal("Simple Test Data".getBytes());
     }
 
-    private static void funcB2()throws Exception {
+    private static void funcB2() throws Exception {
         byte[] iv = getRandomWrapper2b();
         IvParameterSpec ivSpec = new IvParameterSpec(iv);
         Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
@@ -75,7 +68,6 @@ public class Test {
         byte[] ciphertext = cipher.doFinal("Simple Test Data".getBytes());
     }
 
-
     private static void funcA3() throws Exception {
         byte[] iv = getRandomWrapper2b();
         IvParameterSpec ivSpec1 = new IvParameterSpec(iv);
@@ -91,16 +83,12 @@ public class Test {
         byte[] ciphertext2 = cipher2.doFinal("Simple Test Data".getBytes());
     }
 
-
-
-
     public static void main(String[] args) {
-        try{
+        try {
             funcA2();
             funcB1();
             funcB2();
-        }
-        catch(Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }