NetTest refactoring