Add port, and some test output cleanup