Use assertIn where appropriate

Change-Id: I27038279067183352e5a54766fb74515057d581a
Fixed a minor typo in a docstring

Change-Id: I4d822513cc65662a988c7ad10b01ff04fa7d6890
Merge "Use assertIn where appropriate"
Merge "Fixed a minor typo in a docstring"