[builtin/test] Fix 2 parsing bugs