Further work on conflict testing.