4,2: 1,2 tests fixed

-correct style of code
-independent tests now