update unit tests, less monads in json parser