Fixed some bugs in moves class and the test for it