Clean up code.
Added jackson support for Json.
Base implementation for unit tests.