fixed empty cycles bug
extended order-to-cycle; improved tests