Added request suffix and tests