Add back overflow tests