Small test improvement

Change-Id: I4952f652f7c583b6d4420a6a1c95328c5bc072b3
Small test improvement

Change-Id: Ic5f669ef1ad9e35fae79a322370fc9ee43538adc
change the port used for testing

Change-Id: Ibb698f4cde1e4dcbca97a11f0fe9510e381a9304