Fix watch test tasks
Focus elements after adding them