Fixing of watch and tests in progress