Improve watch/test functions