Fix two watch tests to take number format into account.