Add harder binaryop tests