Making progress with grammar, updated sample test