make json_results tests pass again
linting, other cleanup