added more tests. 
refactor Request values objects into one Service Request values object.
refactor removed some definition types and condensed it into a single object with a Type.