Add tests for new cycle API