Fixed #319 (and added some missing parser specs)