Update watch to use test instead of match