[KFSQA-1037] replaced hard coded netids
[KFSQA-1037] remove a couple todo lines