More movement_tests.h fixes