Use JSON response for 404

Update tests to reflect this.