fixed unit tests for type declaration
valid tokens now