Added rollover and tests