Enhancing the tests a bit to include control points