UnitTests port usage cleanup