Clean up test file, watchDirectory accepts an object

This should help a little to clean up the tests and some of the code. I've still got every-other-run fails on the file added test over here, and I'm not exactly sure what some of the parameters you have going into the `watchDirectory` function are, but other than those two things everything is looking fresh :thumbsup: