fix import in unit tests
fix test_conflicts test
Merge pull request #958 from boegel/fix_unit_tests

fix import in unit tests