Tests improved

Change-Id: I0cee085f6cb136878b0d9c7e1cae810f1243b5dc
change the port used for testing

Change-Id: I2fe759bab8d8e22b69666abc39c238c9401d183b