Tests improvments