Improve parser test