Toan | Fixed up some test