Update test cleanup task to reflect new behaviour