Updated grammar
- Replaced upto with bound
- Removed returns clause
- Updated test files