Add better parsing test