Merge "Use assertIn and assertNotIn instead of assertTrue/assertFalse"