small tests improvements