Expanded testing and removed kill on bad json