Fix further menu token test fails