Fix multi-namespace watches and add a test

Fix multi-namespace watches and add a test #981