Rework some tests to use the same mechanisms for loading local jsons #7