Include test2.json and make tests more complete