[PATCH 00/14] NetTestController Refactoring