Rewrote tests to assume generic Hypermedia, offered as JSON or XML