improve stability of tests