add assertIn
Merge branch 'develop'