completed data parser and tests