Added new grammar that solves everything
Adding modified tests