Renamed grammar file, fixed TestButton exception possibility