Added json parser and refactored parser tests