Added test parser
More changes