Client/Server TestEnvironments improved