Pumping up tests and getting watch working.

I am doing this in anticipation of adding support for replaceWith to take a function instead of a string.