Convert to JUnit 4 test and add a timeout, also remove the tcp transport
connector on a fixed port as its not needed.