~ small adaptions to ConflictTest