4,2: 1,1 tests redid

-corrected style of code of tests
-now all test are independent from each other