Parser Fix and Updated a few Tests