Add more cartesian tests