more work on token_test