Revmoed API 17 from tests