Added parser and two test files