Fixed tests after adding uri and value into response