Moved test files to mirror location in app directory.

Refactored Json converters.

Refactored Json converters.