Added more tests.
Moved all JSON to jackson.