(Automated Tests) Fixes following adaptor API change