Support for 2.1.5 and some tests with drawing ARCs