Delegate to interval instead of subclassing.
Fix some tests.