It's not done very nicely, but it succesfully ditches the endless loop. The result is "command unsuccessful" instead. Though vim behaviour is more expectable, it's not that easy to mimic (usually breaking the s/$/x/ case).

The other question would be, where to put tests? In tests/commands_test.cpp?

make tests are passing