another part of tests was rewritten