Updated parser tests for r52726. Also fixed some corner cases and updated the parser...