Improved a little some tests speed