Test unit updates - improve watch