Almost added support for wide moves, only solve missing

86 files changed, 134 insertions, 2 deletions

diff --git a/test/030_move/500_Uw_solved.in b/test/030_move/500_Uw_solved.in
new file mode 100644
index 0000000..3e79076
--- /dev/null
+++ b/test/030_move/500_Uw_solved.in
@@ -0,0 +1,2 @@
+Uw
+ABCDEFGH=ABCDEFGHIJKL=A
diff --git a/test/030_move/500_Uw_solved.out b/test/030_move/500_Uw_solved.out
new file mode 100644
index 0000000..fc08019
--- /dev/null
+++ b/test/030_move/500_Uw_solved.out
@@ -0,0 +1 @@
+ABHGEFCD=ABHGEFCDIJKL=B
diff --git a/test/030_move/501_Uw2_solved.in b/test/030_move/501_Uw2_solved.in
new file mode 100644
index 0000000..fb0cf4b
--- /dev/null
+++ b/test/030_move/501_Uw2_solved.in
@@ -0,0 +1,2 @@
+Uw2
+ABCDEFGH=ABCDEFGHIJKL=A
diff --git a/test/030_move/501_Uw2_solved.out b/test/030_move/501_Uw2_solved.out
new file mode 100644
index 0000000..eb734e6
--- /dev/null
+++ b/test/030_move/501_Uw2_solved.out
@@ -0,0 +1 @@
+ABDCEFHG=ABDCEFHGIJKL=C
diff --git a/test/030_move/502_Uw3_solved.in b/test/030_move/502_Uw3_solved.in
new file mode 100644
index 0000000..3b4ebf6
--- /dev/null
+++ b/test/030_move/502_Uw3_solved.in
@@ -0,0 +1,2 @@
+Uw3
+ABCDEFGH=ABCDEFGHIJKL=A
diff --git a/test/030_move/502_Uw3_solved.out b/test/030_move/502_Uw3_solved.out
new file mode 100644
index 0000000..6724a49
--- /dev/null
+++ b/test/030_move/502_Uw3_solved.out
@@ -0,0 +1 @@
+ABGHEFDC=ABGHEFDCIJKL=D
diff --git a/test/030_move/503_Dw_solved.in b/test/030_move/503_Dw_solved.in
new file mode 100644
index 0000000..da4009e
--- /dev/null
+++ b/test/030_move/503_Dw_solved.in
@@ -0,0 +1,2 @@
+Dw
+ABCDEFGH=ABCDEFGHIJKL=A
diff --git a/test/030_move/503_Dw_solved.out b/test/030_move/503_Dw_solved.out
new file mode 100644
index 0000000..f554f31
--- /dev/null
+++ b/test/030_move/503_Dw_solved.out
@@ -0,0 +1 @@
+FECDABGH=EFCDBAGHIJKL=D
diff --git a/test/030_move/504_Dw2_solved.in b/test/030_move/504_Dw2_solved.in
new file mode 100644
index 0000000..5e403a4
--- /dev/null
+++ b/test/030_move/504_Dw2_solved.in
@@ -0,0 +1,2 @@
+Dw2
+ABCDEFGH=ABCDEFGHIJKL=A
diff --git a/test/030_move/504_Dw2_solved.out b/test/030_move/504_Dw2_solved.out
new file mode 100644
index 0000000..51c13ad
--- /dev/null
+++ b/test/030_move/504_Dw2_solved.out
@@ -0,0 +1 @@
+BACDFEGH=BACDFEGHIJKL=C
diff --git a/test/030_move/505_Dw3_solved.in b/test/030_move/505_Dw3_solved.in
new file mode 100644
index 0000000..d4a9fbb
--- /dev/null
+++ b/test/030_move/505_Dw3_solved.in
@@ -0,0 +1,2 @@
+Dw3
+ABCDEFGH=ABCDEFGHIJKL=A
diff --git a/test/030_move/505_Dw3_solved.out b/test/030_move/505_Dw3_solved.out
new file mode 100644
index 0000000..b842e86
--- /dev/null
+++ b/test/030_move/505_Dw3_solved.out
@@ -0,0 +1 @@
+EFCDBAGH=FECDABGHIJKL=B
diff --git a/test/030_move/506_Rw_solved.in b/test/030_move/506_Rw_solved.in
new file mode 100644
index 0000000..4387d10
--- /dev/null
+++ b/test/030_move/506_Rw_solved.in
@@ -0,0 +1,2 @@
+Rw
+ABCDEFGH=ABCDEFGHIJKL=A
diff --git a/test/030_move/506_Rw_solved.out b/test/030_move/506_Rw_solved.out
new file mode 100644
index 0000000..853c85d
--- /dev/null
+++ b/test/030_move/506_Rw_solved.out
@@ -0,0 +1 @@
+AXUDJFGK=ABCDEKJHIFGL=Q
diff --git a/test/030_move/507_Rw2_solved.in b/test/030_move/507_Rw2_solved.in
new file mode 100644
index 0000000..3510315
--- /dev/null
+++ b/test/030_move/507_Rw2_solved.in
@@ -0,0 +1,2 @@
+Rw2
+ABCDEFGH=ABCDEFGHIJKL=A
diff --git a/test/030_move/507_Rw2_solved.out b/test/030_move/507_Rw2_solved.out
new file mode 100644
index 0000000..f89caca
--- /dev/null
+++ b/test/030_move/507_Rw2_solved.out
@@ -0,0 +1 @@
+ACBDHFGE=ABCDEGFHIKJL=G
diff --git a/test/030_move/508_Rw3_solved.in b/test/030_move/508_Rw3_solved.in
new file mode 100644
index 0000000..69cb0b2
--- /dev/null
+++ b/test/030_move/508_Rw3_solved.in
@@ -0,0 +1,2 @@
+Rw3
+ABCDEFGH=ABCDEFGHIJKL=A
diff --git a/test/030_move/508_Rw3_solved.out b/test/030_move/508_Rw3_solved.out
new file mode 100644
index 0000000..38ae9a9
--- /dev/null
+++ b/test/030_move/508_Rw3_solved.out
@@ -0,0 +1 @@
+AUXDKFGJ=ABCDEJKHIGFL=W
diff --git a/test/030_move/509_Lw_solved.in b/test/030_move/509_Lw_solved.in
new file mode 100644
index 0000000..ddd8aea
--- /dev/null
+++ b/test/030_move/509_Lw_solved.in
@@ -0,0 +1,2 @@
+Lw
+ABCDEFGH=ABCDEFGHIJKL=A
diff --git a/test/030_move/509_Lw_solved.out b/test/030_move/509_Lw_solved.out
new file mode 100644
index 0000000..b588134
--- /dev/null
+++ b/test/030_move/509_Lw_solved.out
@@ -0,0 +1 @@
+WBCVEILH=ABCDIFGLHJKE=W
diff --git a/test/030_move/510_Lw2_solved.in b/test/030_move/510_Lw2_solved.in
new file mode 100644
index 0000000..c0a00b3
--- /dev/null
+++ b/test/030_move/510_Lw2_solved.in
@@ -0,0 +1,2 @@
+Lw2
+ABCDEFGH=ABCDEFGHIJKL=A
diff --git a/test/030_move/510_Lw2_solved.out b/test/030_move/510_Lw2_solved.out
new file mode 100644
index 0000000..9d468db
--- /dev/null
+++ b/test/030_move/510_Lw2_solved.out
@@ -0,0 +1 @@
+DBCAEGFH=ABCDHFGELJKI=G
diff --git a/test/030_move/511_Lw3_solved.in b/test/030_move/511_Lw3_solved.in
new file mode 100644
index 0000000..94b1333
--- /dev/null
+++ b/test/030_move/511_Lw3_solved.in
@@ -0,0 +1,2 @@
+Lw3
+ABCDEFGH=ABCDEFGHIJKL=A
diff --git a/test/030_move/511_Lw3_solved.out b/test/030_move/511_Lw3_solved.out
new file mode 100644
index 0000000..d4f17bb
--- /dev/null
+++ b/test/030_move/511_Lw3_solved.out
@@ -0,0 +1 @@
+VBCWELIH=ABCDLFGIEJKH=Q
diff --git a/test/030_move/512_Fw_solved.in b/test/030_move/512_Fw_solved.in
new file mode 100644
index 0000000..179dab4
--- /dev/null
+++ b/test/030_move/512_Fw_solved.in
@@ -0,0 +1,2 @@
+Fw
+ABCDEFGH=ABCDEFGHIJKL=A
diff --git a/test/030_move/512_Fw_solved.out b/test/030_move/512_Fw_solved.out
new file mode 100644
index 0000000..966f275
--- /dev/null
+++ b/test/030_move/512_Fw_solved.out
@@ -0,0 +1 @@
+ANCPETGR=AbaDEFGHIJRS=M
diff --git a/test/030_move/513_Fw2_solved.in b/test/030_move/513_Fw2_solved.in
new file mode 100644
index 0000000..94fd724
--- /dev/null
+++ b/test/030_move/513_Fw2_solved.in
@@ -0,0 +1,2 @@
+Fw2
+ABCDEFGH=ABCDEFGHIJKL=A
diff --git a/test/030_move/513_Fw2_solved.out b/test/030_move/513_Fw2_solved.out
new file mode 100644
index 0000000..06c3560
--- /dev/null
+++ b/test/030_move/513_Fw2_solved.out
@@ -0,0 +1 @@
+ADCBEHGF=ACBDEFGHIJLK=E
diff --git a/test/030_move/514_Fw3_solved.in b/test/030_move/514_Fw3_solved.in
new file mode 100644
index 0000000..5287f6a
--- /dev/null
+++ b/test/030_move/514_Fw3_solved.in
@@ -0,0 +1,2 @@
+Fw3
+ABCDEFGH=ABCDEFGHIJKL=A
diff --git a/test/030_move/514_Fw3_solved.out b/test/030_move/514_Fw3_solved.out
new file mode 100644
index 0000000..659a09e
--- /dev/null
+++ b/test/030_move/514_Fw3_solved.out
@@ -0,0 +1 @@
+APCNERGT=AabDEFGHIJSR=I
diff --git a/test/030_move/515_Bw_solved.in b/test/030_move/515_Bw_solved.in
new file mode 100644
index 0000000..13eac57
--- /dev/null
+++ b/test/030_move/515_Bw_solved.in
@@ -0,0 +1,2 @@
+Bw
+ABCDEFGH=ABCDEFGHIJKL=A
diff --git a/test/030_move/515_Bw_solved.out b/test/030_move/515_Bw_solved.out
new file mode 100644
index 0000000..28af170
--- /dev/null
+++ b/test/030_move/515_Bw_solved.out
@@ -0,0 +1 @@
+MBODSFQH=ZBCYEFGHQTKL=I
diff --git a/test/030_move/516_Bw2_solved.in b/test/030_move/516_Bw2_solved.in
new file mode 100644
index 0000000..989ad7c
--- /dev/null
+++ b/test/030_move/516_Bw2_solved.in
@@ -0,0 +1,2 @@
+Bw2
+ABCDEFGH=ABCDEFGHIJKL=A
diff --git a/test/030_move/516_Bw2_solved.out b/test/030_move/516_Bw2_solved.out
new file mode 100644
index 0000000..43b400d
--- /dev/null
+++ b/test/030_move/516_Bw2_solved.out
@@ -0,0 +1 @@
+CBADGFEH=DBCAEFGHJIKL=E
diff --git a/test/030_move/517_Bw3_solved.in b/test/030_move/517_Bw3_solved.in
new file mode 100644
index 0000000..a53c4e9
--- /dev/null
+++ b/test/030_move/517_Bw3_solved.in
@@ -0,0 +1,2 @@
+Bw3
+ABCDEFGH=ABCDEFGHIJKL=A
diff --git a/test/030_move/517_Bw3_solved.out b/test/030_move/517_Bw3_solved.out
new file mode 100644
index 0000000..e10aaf5
--- /dev/null
+++ b/test/030_move/517_Bw3_solved.out
@@ -0,0 +1 @@
+OBMDQFSH=YBCZEFGHTQKL=M
diff --git a/test/030_move/518_M_solved.in b/test/030_move/518_M_solved.in
new file mode 100644
index 0000000..599d8ff
--- /dev/null
+++ b/test/030_move/518_M_solved.in
@@ -0,0 +1,2 @@
+M
+ABCDEFGH=ABCDEFGHIJKL=A
diff --git a/test/030_move/518_M_solved.out b/test/030_move/518_M_solved.out
new file mode 100644
index 0000000..6b28216
--- /dev/null
+++ b/test/030_move/518_M_solved.out
@@ -0,0 +1 @@
+WUXVKILJ=ABCDIJKLHGFE=W
diff --git a/test/030_move/519_M2_solved.in b/test/030_move/519_M2_solved.in
new file mode 100644
index 0000000..d0479b8
--- /dev/null
+++ b/test/030_move/519_M2_solved.in
@@ -0,0 +1,2 @@
+M2
+ABCDEFGH=ABCDEFGHIJKL=A
diff --git a/test/030_move/519_M2_solved.out b/test/030_move/519_M2_solved.out
new file mode 100644
index 0000000..e28cb4e
--- /dev/null
+++ b/test/030_move/519_M2_solved.out
@@ -0,0 +1 @@
+DCBAHGFE=ABCDHGFELKJI=G
diff --git a/test/030_move/520_M3_solved.in b/test/030_move/520_M3_solved.in
new file mode 100644
index 0000000..32bff5a
--- /dev/null
+++ b/test/030_move/520_M3_solved.in
@@ -0,0 +1,2 @@
+M3
+ABCDEFGH=ABCDEFGHIJKL=A
diff --git a/test/030_move/520_M3_solved.out b/test/030_move/520_M3_solved.out
new file mode 100644
index 0000000..1d47a15
--- /dev/null
+++ b/test/030_move/520_M3_solved.out
@@ -0,0 +1 @@
+VXUWJLIK=ABCDLKJIEFGH=Q
diff --git a/test/030_move/521_S_solved.in b/test/030_move/521_S_solved.in
new file mode 100644
index 0000000..9e08bff
--- /dev/null
+++ b/test/030_move/521_S_solved.in
@@ -0,0 +1,2 @@
+S
+ABCDEFGH=ABCDEFGHIJKL=A
diff --git a/test/030_move/521_S_solved.out b/test/030_move/521_S_solved.out
new file mode 100644
index 0000000..74b55a2
--- /dev/null
+++ b/test/030_move/521_S_solved.out
@@ -0,0 +1 @@
+ONMPQTSR=YbaZEFGHTQRS=M
diff --git a/test/030_move/522_S2_solved.in b/test/030_move/522_S2_solved.in
new file mode 100644
index 0000000..49818d0
--- /dev/null
+++ b/test/030_move/522_S2_solved.in
@@ -0,0 +1,2 @@
+S2
+ABCDEFGH=ABCDEFGHIJKL=A
diff --git a/test/030_move/522_S2_solved.out b/test/030_move/522_S2_solved.out
new file mode 100644
index 0000000..85245c3
--- /dev/null
+++ b/test/030_move/522_S2_solved.out
@@ -0,0 +1 @@
+CDABGHEF=DCBAEFGHJILK=E
diff --git a/test/030_move/523_S3_solved.in b/test/030_move/523_S3_solved.in
new file mode 100644
index 0000000..3cdc3d6
--- /dev/null
+++ b/test/030_move/523_S3_solved.in
@@ -0,0 +1,2 @@
+S3
+ABCDEFGH=ABCDEFGHIJKL=A
diff --git a/test/030_move/523_S3_solved.out b/test/030_move/523_S3_solved.out
new file mode 100644
index 0000000..ac53534
--- /dev/null
+++ b/test/030_move/523_S3_solved.out
@@ -0,0 +1 @@
+MPONSRQT=ZabYEFGHQTSR=I
diff --git a/test/030_move/524_E_solved.in b/test/030_move/524_E_solved.in
new file mode 100644
index 0000000..03b48ef
--- /dev/null
+++ b/test/030_move/524_E_solved.in
@@ -0,0 +1,2 @@
+E
+ABCDEFGH=ABCDEFGHIJKL=A
diff --git a/test/030_move/524_E_solved.out b/test/030_move/524_E_solved.out
new file mode 100644
index 0000000..54fcf98
--- /dev/null
+++ b/test/030_move/524_E_solved.out
@@ -0,0 +1 @@
+FEGHABDC=EFGHBADCIJKL=D
diff --git a/test/030_move/525_E2_solved.in b/test/030_move/525_E2_solved.in
new file mode 100644
index 0000000..faee27c
--- /dev/null
+++ b/test/030_move/525_E2_solved.in
@@ -0,0 +1,2 @@
+E2
+ABCDEFGH=ABCDEFGHIJKL=A
diff --git a/test/030_move/525_E2_solved.out b/test/030_move/525_E2_solved.out
new file mode 100644
index 0000000..330a390
--- /dev/null
+++ b/test/030_move/525_E2_solved.out
@@ -0,0 +1 @@
+BADCFEHG=BADCFEHGIJKL=C
diff --git a/test/030_move/526_E3_solved.in b/test/030_move/526_E3_solved.in
new file mode 100644
index 0000000..17fa78d
--- /dev/null
+++ b/test/030_move/526_E3_solved.in
@@ -0,0 +1,2 @@
+E3
+ABCDEFGH=ABCDEFGHIJKL=A
diff --git a/test/030_move/526_E3_solved.out b/test/030_move/526_E3_solved.out
new file mode 100644
index 0000000..cb55358
--- /dev/null
+++ b/test/030_move/526_E3_solved.out
@@ -0,0 +1 @@
+EFHGBACD=FEHGABCDIJKL=B
diff --git a/test/030_move/527_x_solved.in b/test/030_move/527_x_solved.in
new file mode 100644
index 0000000..f26b8c5
--- /dev/null
+++ b/test/030_move/527_x_solved.in
@@ -0,0 +1,2 @@
+x
+ABCDEFGH=ABCDEFGHIJKL=A
diff --git a/test/030_move/527_x_solved.out b/test/030_move/527_x_solved.out
new file mode 100644
index 0000000..29fefad
--- /dev/null
+++ b/test/030_move/527_x_solved.out
@@ -0,0 +1 @@
+ABCDEFGH=ABCDEFGHIJKL=Q
diff --git a/test/030_move/528_x2_solved.in b/test/030_move/528_x2_solved.in
new file mode 100644
index 0000000..c538316
--- /dev/null
+++ b/test/030_move/528_x2_solved.in
@@ -0,0 +1,2 @@
+x2
+ABCDEFGH=ABCDEFGHIJKL=A
diff --git a/test/030_move/528_x2_solved.out b/test/030_move/528_x2_solved.out
new file mode 100644
index 0000000..cebf79a
--- /dev/null
+++ b/test/030_move/528_x2_solved.out
@@ -0,0 +1 @@
+ABCDEFGH=ABCDEFGHIJKL=G
diff --git a/test/030_move/529_x3_solved.in b/test/030_move/529_x3_solved.in
new file mode 100644
index 0000000..cc314b4
--- /dev/null
+++ b/test/030_move/529_x3_solved.in
@@ -0,0 +1,2 @@
+x3
+ABCDEFGH=ABCDEFGHIJKL=A
diff --git a/test/030_move/529_x3_solved.out b/test/030_move/529_x3_solved.out
new file mode 100644
index 0000000..2449874
--- /dev/null
+++ b/test/030_move/529_x3_solved.out
@@ -0,0 +1 @@
+ABCDEFGH=ABCDEFGHIJKL=W
diff --git a/test/030_move/530_y_solved.in b/test/030_move/530_y_solved.in
new file mode 100644
index 0000000..07ec332
--- /dev/null
+++ b/test/030_move/530_y_solved.in
@@ -0,0 +1,2 @@
+y
+ABCDEFGH=ABCDEFGHIJKL=A
diff --git a/test/030_move/530_y_solved.out b/test/030_move/530_y_solved.out
new file mode 100644
index 0000000..4749dd6
--- /dev/null
+++ b/test/030_move/530_y_solved.out
@@ -0,0 +1 @@
+ABCDEFGH=ABCDEFGHIJKL=B
diff --git a/test/030_move/531_y2_solved.in b/test/030_move/531_y2_solved.in
new file mode 100644
index 0000000..a77c990
--- /dev/null
+++ b/test/030_move/531_y2_solved.in
@@ -0,0 +1,2 @@
+y2
+ABCDEFGH=ABCDEFGHIJKL=A
diff --git a/test/030_move/531_y2_solved.out b/test/030_move/531_y2_solved.out
new file mode 100644
index 0000000..c876a74
--- /dev/null
+++ b/test/030_move/531_y2_solved.out
@@ -0,0 +1 @@
+ABCDEFGH=ABCDEFGHIJKL=C
diff --git a/test/030_move/532_y3_solved.in b/test/030_move/532_y3_solved.in
new file mode 100644
index 0000000..d52024c
--- /dev/null
+++ b/test/030_move/532_y3_solved.in
@@ -0,0 +1,2 @@
+y3
+ABCDEFGH=ABCDEFGHIJKL=A
diff --git a/test/030_move/532_y3_solved.out b/test/030_move/532_y3_solved.out
new file mode 100644
index 0000000..3a5afc2
--- /dev/null
+++ b/test/030_move/532_y3_solved.out
@@ -0,0 +1 @@
+ABCDEFGH=ABCDEFGHIJKL=D
diff --git a/test/030_move/533_z_solved.in b/test/030_move/533_z_solved.in
new file mode 100644
index 0000000..af78379
--- /dev/null
+++ b/test/030_move/533_z_solved.in
@@ -0,0 +1,2 @@
+z
+ABCDEFGH=ABCDEFGHIJKL=A
diff --git a/test/030_move/533_z_solved.out b/test/030_move/533_z_solved.out
new file mode 100644
index 0000000..9267695
--- /dev/null
+++ b/test/030_move/533_z_solved.out
@@ -0,0 +1 @@
+ABCDEFGH=ABCDEFGHIJKL=M
diff --git a/test/030_move/534_z2_solved.in b/test/030_move/534_z2_solved.in
new file mode 100644
index 0000000..2f702a1
--- /dev/null
+++ b/test/030_move/534_z2_solved.in
@@ -0,0 +1,2 @@
+z2
+ABCDEFGH=ABCDEFGHIJKL=A
diff --git a/test/030_move/534_z2_solved.out b/test/030_move/534_z2_solved.out
new file mode 100644
index 0000000..94daec7
--- /dev/null
+++ b/test/030_move/534_z2_solved.out
@@ -0,0 +1 @@
+ABCDEFGH=ABCDEFGHIJKL=E
diff --git a/test/030_move/535_z3_solved.in b/test/030_move/535_z3_solved.in
new file mode 100644
index 0000000..f697279
--- /dev/null
+++ b/test/030_move/535_z3_solved.in
@@ -0,0 +1,2 @@
+z3
+ABCDEFGH=ABCDEFGHIJKL=A
diff --git a/test/030_move/535_z3_solved.out b/test/030_move/535_z3_solved.out
new file mode 100644
index 0000000..fd02d56
--- /dev/null
+++ b/test/030_move/535_z3_solved.out
@@ -0,0 +1 @@
+ABCDEFGH=ABCDEFGHIJKL=I
diff --git a/test/030_move/550_scrambled_random.in b/test/030_move/550_scrambled_random.in
new file mode 100644
index 0000000..35cd8bd
--- /dev/null
+++ b/test/030_move/550_scrambled_random.in
@@ -0,0 +1,2 @@
+R2 Uw F x Bw2 M' y2 z S3
+ABCDEFGH=ABCDEFGHIJKL=F
diff --git a/test/030_move/550_scrambled_random.out b/test/030_move/550_scrambled_random.out
new file mode 100644
index 0000000..b3f81b0
--- /dev/null
+++ b/test/030_move/550_scrambled_random.out
@@ -0,0 +1 @@
+WTCEAFJP=TXWRLKQUJVIS=C
diff --git a/test/032_countmoves/00_empty.in b/test/032_countmoves/00_empty.in
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/test/032_countmoves/00_empty.in
@@ -0,0 +1 @@
+
diff --git a/test/032_countmoves/00_empty.out b/test/032_countmoves/00_empty.out
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/test/032_countmoves/00_empty.out
@@ -0,0 +1 @@
+0
diff --git a/test/032_countmoves/01_U.in b/test/032_countmoves/01_U.in
new file mode 100644
index 0000000..765140b
--- /dev/null
+++ b/test/032_countmoves/01_U.in
@@ -0,0 +1 @@
+U
diff --git a/test/032_countmoves/01_U.out b/test/032_countmoves/01_U.out
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/test/032_countmoves/01_U.out
@@ -0,0 +1 @@
+1
diff --git a/test/032_countmoves/02_Fw3.in b/test/032_countmoves/02_Fw3.in
new file mode 100644
index 0000000..699e64c
--- /dev/null
+++ b/test/032_countmoves/02_Fw3.in
@@ -0,0 +1 @@
+Fw'
diff --git a/test/032_countmoves/02_Fw3.out b/test/032_countmoves/02_Fw3.out
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/test/032_countmoves/02_Fw3.out
@@ -0,0 +1 @@
+1
diff --git a/test/032_countmoves/03_S2.in b/test/032_countmoves/03_S2.in
new file mode 100644
index 0000000..778c8ff
--- /dev/null
+++ b/test/032_countmoves/03_S2.in
@@ -0,0 +1 @@
+S2
diff --git a/test/032_countmoves/03_S2.out b/test/032_countmoves/03_S2.out
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/test/032_countmoves/03_S2.out
@@ -0,0 +1 @@
+2
diff --git a/test/032_countmoves/04_y3.in b/test/032_countmoves/04_y3.in
new file mode 100644
index 0000000..b536014
--- /dev/null
+++ b/test/032_countmoves/04_y3.in
@@ -0,0 +1 @@
+y'
diff --git a/test/032_countmoves/04_y3.out b/test/032_countmoves/04_y3.out
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/test/032_countmoves/04_y3.out
@@ -0,0 +1 @@
+0
diff --git a/test/032_countmoves/countmoves_tests.c b/test/032_countmoves/countmoves_tests.c
new file mode 100644
index 0000000..b2c9946
--- /dev/null
+++ b/test/032_countmoves/countmoves_tests.c
@@ -0,0 +1,11 @@
+#include "../test.h"
+
+int64_t countmoves(const char *);
+
+void run(void) {
+        char movestr[STRLENMAX];
+
+        fgets(movestr, STRLENMAX, stdin);
+
+        printf("%" PRId64 "\n", countmoves(movestr));
+}
diff --git a/test/062_transform_move/transform_move_tests.c b/test/062_transform_move/transform_move_tests.c
index 4f554c7..39e8619 100644
--- a/test/062_transform_move/transform_move_tests.c
+++ b/test/062_transform_move/transform_move_tests.c
@@ -5,7 +5,7 @@
 cube_t applytrans(cube_t, const char *);
 uint8_t transform_move(uint8_t, uint8_t);
 int64_t readmoves(const char *, size_t n, uint8_t [n]);
-cube_t move(cube_t, uint8_t);
+oriented_cube_t move_extended(oriented_cube_t, uint8_t);
 oriented_cube_t applymoves(oriented_cube_t, const char *);
 uint8_t readtrans(const char[static NISSY_SIZE_TRANSFORMATION]);
 
@@ -22,7 +22,7 @@ void run(void) {
         n = readmoves(movestr, MAXMOVES, moves);
         t = readtrans(transtr);
         for (i = 0; i < n; i++)
-                cube.cube = move(cube.cube, transform_move(moves[i], t));
+                cube = move_extended(cube, transform_move(moves[i], t));
 
         writecube(cube, STRLENMAX, cubestr);
         printf("%s\n", cubestr);