crichton refactoring: fixing failing specs

@mdsol/hypermedia-team please review and merge.

This must be merged after: #161