Fix + improve watch test.