To Json test.
Refactor. Two new packages.