Modify tests to account for dependent destroy/nullify.