Better watch conditions for testing