changed tests to comply with grammar specification
extended Expr() now passes all tests