Minor changes and added TokenReaderTest