Added Parser and tests