Fixed functional test cases for move_criterion