Remove interval override option, improve test coverage to 100%.