Changed test framework to not use the stop port, removed a couple of references to the stop port