Split the hypermedia rw tests
Remove some blocking and reindent
Actually remove some blocking and reindent
Some work on merge tests