- restored the "order=3" patch in the first pull request, which works fine
- introduced a hack to fix geometries of 3- and 4-membered rings containing
  sp2 atoms which produces nice 3D coordinates
- modified test files accordingly