#FD-122 Testing conflicts