[PATCH 13/14] NetTestController: Major Refactoring