Fixed test failure on cleanup job