Update test to be more careful and add logs