Added parser and tests