Rewrited tests

few fix
tests rewrited