Tidy up JSON strings in tests