Minor intersection test fixes