wip
Fixed tests in watch and watch-logs.
Small refactor to parse json in one place in watch.