Fixed all test cases (except the one that is semantically not correct at the moment, so we have to figure out, what result we want and how to extend semantics)