Added support for including a server ID as part of the test ID