Use the shift operator and not concat

While the code with concat would run, it didn't appear to have any effect on
the keywords. We'll shift them one at a time instead, and this seems to work.
Adjust data stream test so that it fails

(was pending)