10 files changed, 3 insertions, 47 deletions

diff --git a/test/001_cube_conversion/00_solved.in b/test/001_cube_conversion/00_solved.in
deleted file mode 100644
index dff224d..0000000
--- a/test/001_cube_conversion/00_solved.in
+++ /dev/null
@@ -1 +0,0 @@
-UF0 UB0 DB0 DF0 UR0 UL0 DL0 DR0 FR0 FL0 BL0 BR0 UFR0 UBL0 DFL0 DBR0 UFL0 UBR0 DFR0 DBL0
diff --git a/test/001_cube_conversion/00_solved.out b/test/001_cube_conversion/00_solved.out
deleted file mode 100644
index dff224d..0000000
--- a/test/001_cube_conversion/00_solved.out
+++ /dev/null
@@ -1 +0,0 @@
-UF0 UB0 DB0 DF0 UR0 UL0 DL0 DR0 FR0 FL0 BL0 BR0 UFR0 UBL0 DFL0 DBR0 UFL0 UBR0 DFR0 DBL0
diff --git a/test/001_cube_conversion/01_scrambled.in b/test/001_cube_conversion/01_scrambled.in
deleted file mode 100644
index 453cc8a..0000000
--- a/test/001_cube_conversion/01_scrambled.in
+++ /dev/null
@@ -1 +0,0 @@
-BL1 DB0 UL1 DF0 BR1 UF1 DL0 FL1 UB0 DR1 FR1 UR1 UBR2 UBL1 DFR2 DBL2 DBR0 DFL0 UFR0 UFL2
diff --git a/test/001_cube_conversion/01_scrambled.out b/test/001_cube_conversion/01_scrambled.out
deleted file mode 100644
index 453cc8a..0000000
--- a/test/001_cube_conversion/01_scrambled.out
+++ /dev/null
@@ -1 +0,0 @@
-BL1 DB0 UL1 DF0 BR1 UF1 DL0 FL1 UB0 DR1 FR1 UR1 UBR2 UBL1 DFR2 DBL2 DBR0 DFL0 UFR0 UFL2
diff --git a/test/001_cube_conversion/cube_conversion_tests.c b/test/001_cube_conversion/cube_conversion_tests.c
deleted file mode 100644
index fe8a68f..0000000
--- a/test/001_cube_conversion/cube_conversion_tests.c
+++ /dev/null
@@ -1,27 +0,0 @@
-#include "../test.h"
-
-cube_fast_t cubetofast(cube_t);
-cube_t fasttocube(cube_fast_t);
-bool equal(cube_t, cube_t);
-
-int main(void) {
-        char cubestr[STRLENMAX];
-        cube_t cube, cube2;
-        cube_fast_t fast;
-
-        fgets(cubestr, STRLENMAX, stdin);
-        cube = readcube("H48", cubestr);
-        fast = cubetofast(cube);
-        cube2 = fasttocube(fast);
-
-        if (cube_error(cube)) {
-                printf("Error reading cube\n");
-        } else if (cube_error(cube2)) {
-                printf("Error converting cube\n");
-        } else {
-                writecube("H48", cube2, cubestr);
-                printf("%s\n", cubestr);
-        }
-
-        return 0;
-}
diff --git a/test/050_compose/compose_tests.c b/test/050_compose/compose_tests.c
index c0bbbef..3bf6c34 100644
--- a/test/050_compose/compose_tests.c
+++ b/test/050_compose/compose_tests.c
@@ -1,7 +1,5 @@
 #include "../test.h"
 
-cube_t compose(cube_t, cube_t);
-
 int main(void) {
         char str[STRLENMAX];
         cube_t c1, c2, c3;
@@ -11,7 +9,7 @@ int main(void) {
         fgets(str, STRLENMAX, stdin);
         c2 = readcube("H48", str);
 
-        c3 = compose(c1, c2);
+        c3 = cube_compose(c1, c2);
 
         if (cube_error(c3)) {
                 printf("Error composing cubes\n");
diff --git a/test/071_coord_eo/coord_eo_tests.c b/test/071_coord_eo/coord_eo_tests.c
index 85128e0..5951042 100644
--- a/test/071_coord_eo/coord_eo_tests.c
+++ b/test/071_coord_eo/coord_eo_tests.c
@@ -1,19 +1,14 @@
 #include "../test.h"
 
-int64_t coord_fast_eo(cube_fast_t);
-cube_fast_t cubetofast(cube_t);
-
 int main(void) {
         char str[STRLENMAX];
         cube_t cube;
-        cube_fast_t fast;
         int64_t result;
 
         fgets(str, STRLENMAX, stdin);
         cube = readcube("H48", str);
-        fast = cubetofast(cube);
 
-        result = coord_fast_eo(fast);
+        result = cube_coord_eo(cube);
 
         printf("%" PRId64 "\n", result);
 
diff --git a/test/072_coord_co/coord_co_tests.c b/test/072_coord_co/coord_co_tests.c
index bb061e5..aa4136b 100644
--- a/test/072_coord_co/coord_co_tests.c
+++ b/test/072_coord_co/coord_co_tests.c
@@ -1,19 +1,14 @@
 #include "../test.h"
 
-int64_t coord_fast_co(cube_fast_t);
-cube_fast_t cubetofast(cube_t);
-
 int main(void) {
         char str[STRLENMAX];
         cube_t cube;
-        cube_fast_t fast;
         int64_t result;
 
         fgets(str, STRLENMAX, stdin);
         cube = readcube("H48", str);
-        fast = cubetofast(cube);
 
-        result = coord_fast_co(fast);
+        result = cube_coord_co(cube);
 
         printf("%" PRId64 "\n", result);
 
diff --git a/test/last.err b/test/last.err
deleted file mode 100644
index e69de29..0000000
--- a/test/last.err
+++ /dev/null
diff --git a/test/last.out b/test/last.out
deleted file mode 100644
index 102ac1b..0000000
--- a/test/last.out
+++ /dev/null
@@ -1 +0,0 @@
-UL1 UB0 DL1 UR0 BL1 DR1 BR0 DB0 FL1 UF0 FR1 DF0 DFR2 DFL0 DBL0 UFL0 UBR1 UBL0 UFR2 DBR1