Added tests for conflict