[PATCH 2/4] NetTestController: Adding missing cleanup