We now deal with ellipses
Updated the test suite