Conor Benn fight announced as boxer returns after failed drug tests