imporving tests[ci skip]