Fixing service version issues/Fixing test failures