Remote watcher test fixed and finished - resolves #314