Updated testing infrastrucutre to use common port, etc.