move smoke test to automated tests, fix matching typo, enable better lookeahead for combining blocks