Improve parsing test