Give port number as service property for standalone
Test improvements