Fixed remaining tests. Adapting for current version of ConnId framework.