all json tested with test cases, fixed up test cases and restructured