Updated grammar
Added set expr test