test coverage. more unit tests. removing json stuff.