Fixed parser with basic testing