Use explicit 'next' returning
- fix test runs