Tests improvment