Finally got that stinking token test to pass.