Add null checks to test cleanup