Refactoring and grammar test suit.