clean up testing of conflict test