improving some tests behavior