watch test fix, small improvements