Fix the block, expiration and choice deletion tests