Issue #9: Pass tests for TestConflictPreprocessor

Actually implemented the tests.