Fix test by using manual parsing (temporarily?)