Test conflicts fixed