Added parser classes and parser test