Refatoring RequestServerResource and tests