diff --git a/graphics/convert_tables.sh b/graphics/convert_tables.sh
index 732d8bf..704cd77 100644
--- a/graphics/convert_tables.sh
+++ b/graphics/convert_tables.sh
@@ -9,8 +9,7 @@ TYPES=(
   "commitment"
   "gake"
 )
-# Ns=(2 4 8 16 32 64 128)
-Ns=(2 4)
+Ns=(2 4 8 16 32 64 128 256 512)
 
 mkdir -p ${FOLDER}/${OUTPUT}
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 2d94119..10f27fa 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -42,36 +42,35 @@ add_executable(test_speed_kem ${TEST_SPEED_KEM})
 target_link_libraries(test_speed_kem PUBLIC oqs ${OPENSSL_CRYPTO_LIBRARY})
 target_link_libraries(test_speed_kem PRIVATE m)
 
-# add_test(NAME aes256gcm COMMAND test_aes256gcm)
-# add_test(NAME test_gcwr_ake COMMAND test_gcwr_ake)
-# add_test(NAME test_indcca COMMAND test_indcca)
-# add_test(NAME test_commitment COMMAND test_commitment)
-# add_test(NAME test_gake_Kyber512 COMMAND test_gake 100 Kyber512)
-# add_test(NAME test_gake_Kyber768 COMMAND test_gake 100 Kyber768)
-# add_test(NAME test_gake_Kyber1024 COMMAND test_gake 100 Kyber1024)
-# add_test(NAME test_gake_LightSaber-KEM COMMAND test_gake 100 LightSaber-KEM)
-# add_test(NAME test_gake_Saber-KEM COMMAND test_gake 100 Saber-KEM)
-# add_test(NAME test_gake_FireSaber-KEM COMMAND test_gake 100 FireSaber-KEM)
-# add_test(NAME test_gake_NTRU-HPS-2048-509 COMMAND test_gake 100 NTRU-HPS-2048-509)
-# add_test(NAME test_gake_NTRU-HPS-2048-677 COMMAND test_gake 100 NTRU-HPS-2048-677)
-# add_test(NAME test_gake_NTRU-HPS-4096-821 COMMAND test_gake 100 NTRU-HPS-4096-821)
-# add_test(NAME test_gake_Classic-McEliece-348864 COMMAND test_gake 20 Classic-McEliece-348864)
-# add_test(NAME test_gake_Classic-McEliece-348864f COMMAND test_gake 20 Classic-McEliece-348864f)
-# add_test(NAME test_gake_Classic-McEliece-460896 COMMAND test_gake 20 Classic-McEliece-460896)
-# add_test(NAME test_gake_Classic-McEliece-460896f COMMAND test_gake 20 Classic-McEliece-460896f)
-# add_test(NAME test_gake_Classic-McEliece-6688128 COMMAND test_gake 20 Classic-McEliece-6688128)
-# add_test(NAME test_gake_Classic-McEliece-6688128f COMMAND test_gake 20 Classic-McEliece-6688128f)
-# add_test(NAME test_gake_Classic-McEliece-6960119 COMMAND test_gake 20 Classic-McEliece-6960119)
-# add_test(NAME test_gake_Classic-McEliece-6960119f COMMAND test_gake 20 Classic-McEliece-6960119f)
-# add_test(NAME test_gake_Classic-McEliece-8192128 COMMAND test_gake 20 Classic-McEliece-8192128)
-# add_test(NAME test_gake_Classic-McEliece-8192128f COMMAND test_gake 20 Classic-McEliece-8192128f)
+add_test(NAME aes256gcm COMMAND test_aes256gcm)
+add_test(NAME test_gcwr_ake COMMAND test_gcwr_ake)
+add_test(NAME test_indcca COMMAND test_indcca)
+add_test(NAME test_commitment COMMAND test_commitment)
+add_test(NAME test_gake_Kyber512 COMMAND test_gake 100 Kyber512)
+add_test(NAME test_gake_Kyber768 COMMAND test_gake 100 Kyber768)
+add_test(NAME test_gake_Kyber1024 COMMAND test_gake 100 Kyber1024)
+add_test(NAME test_gake_LightSaber-KEM COMMAND test_gake 100 LightSaber-KEM)
+add_test(NAME test_gake_Saber-KEM COMMAND test_gake 100 Saber-KEM)
+add_test(NAME test_gake_FireSaber-KEM COMMAND test_gake 100 FireSaber-KEM)
+add_test(NAME test_gake_NTRU-HPS-2048-509 COMMAND test_gake 100 NTRU-HPS-2048-509)
+add_test(NAME test_gake_NTRU-HPS-2048-677 COMMAND test_gake 100 NTRU-HPS-2048-677)
+add_test(NAME test_gake_NTRU-HPS-4096-821 COMMAND test_gake 100 NTRU-HPS-4096-821)
+add_test(NAME test_gake_Classic-McEliece-348864 COMMAND test_gake 20 Classic-McEliece-348864)
+add_test(NAME test_gake_Classic-McEliece-348864f COMMAND test_gake 20 Classic-McEliece-348864f)
+add_test(NAME test_gake_Classic-McEliece-460896 COMMAND test_gake 20 Classic-McEliece-460896)
+add_test(NAME test_gake_Classic-McEliece-460896f COMMAND test_gake 20 Classic-McEliece-460896f)
+add_test(NAME test_gake_Classic-McEliece-6688128 COMMAND test_gake 20 Classic-McEliece-6688128)
+add_test(NAME test_gake_Classic-McEliece-6688128f COMMAND test_gake 20 Classic-McEliece-6688128f)
+add_test(NAME test_gake_Classic-McEliece-6960119 COMMAND test_gake 20 Classic-McEliece-6960119)
+add_test(NAME test_gake_Classic-McEliece-6960119f COMMAND test_gake 20 Classic-McEliece-6960119f)
+add_test(NAME test_gake_Classic-McEliece-8192128 COMMAND test_gake 20 Classic-McEliece-8192128)
+add_test(NAME test_gake_Classic-McEliece-8192128f COMMAND test_gake 20 Classic-McEliece-8192128f)
 
 add_test(NAME test_speed_kem COMMAND sh -c "$<TARGET_FILE:test_speed_kem> > ../kem.txt")
 add_test(NAME test_speed_ake COMMAND sh -c "$<TARGET_FILE:test_speed_ake> > ../ake.txt")
 add_test(NAME test_speed_commitment COMMAND sh -c "$<TARGET_FILE:test_speed_commitment> > ../commitment.txt")
 
-# set(Ns 2 4 8 16 32 64 128)
-set(Ns 2 4)
+set(Ns 2 4 8 16 32 64 128 256 512)
 foreach(N IN LISTS Ns)
   add_test(NAME test_speed_gake_${N} COMMAND sh -c "$<TARGET_FILE:test_speed_gake> ${N} > ../gake_${N}.txt")
 endforeach()