Make unary/binary tests more consistent