Improved non-planar tests