Use assertIn where appropriate

Change-Id: I27038279067183352e5a54766fb74515057d581a
Merge "Use assertIn where appropriate"