Some tests improvements