Tidy up server specs and use custom matcher for valid JSON