collapsed a type hierarchy and made tests work on my laptop
simplified the request names
Merge pull request #14 from aarondandy/collapse-10

Collapse 10