Getting tests to pass for new watch