Added unit tests for conflict solver