More powerful virtual test server for unit tests (#3022)

More powerful virtual test server for unit tests (#3022) #2159