Fix test

Fix a couple of regressions introduced by edd212d62d6135fe80e4be033a577ba13b13553e.

Please do run tests before commiting any code changing parsing code.