p7519: move watchman cleanup earlier in the test