Add test improvment