updated Watch and tests