crichton refactoring: fixing discovery and associated specs

@jcarres-mdsol @mdsol/hypermedia-team please merge!