Fixed iptestcontroller rebase issues