EZP-21018: REST Tests, fixes on suffix