Fix the token serialization
Tests for AnnotateFirstPass