Add PeekNextToken to Scanner, clean up some tests