Make watch_path tests a little less fragile