More progress, assert_tokens_match is working