tests, split json files, string fix

Change-Id: Ic104322222d68535057f2843c973c43f81009d65
8 files changed