crichton refactoring: fixing discovery and associated specs

@mdsol/hypermedia-team Please review and merge.

Can be merged before #155.