Add tests for other Notation type tokens
Finalize Notation token implementation