Finally got movement_tests.h fixed