moved to jsonparser and updated tests