Refactoring and bugfixing of Director and NetTest