added statement rotation for addition/subtraction and some tests + fixed errors