Minor nits.
Adding test functionlity.
Adding defined values for init and next.