improved test coverage and removed json root