finish statementP, exprP, adding test cases