Added test to prevent future regression
Moved to peeking for next word but something is seriously effed