Fixed numeric test bugs