Add tests for 2- and 4-grams