Fix Net2Com Unit tests... adapt to last commit(s)