Fixed broken tests
Use assertContains instead of assertIn
Fixed unmerged conflicts