add retry tests, bug fixes, rename on.on_next to on.next in tests