Changed test environment to allow for more client tests