Use assertIn where appropriate

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