Improved testing: Added grammar test