Addressed comments and Added RichIntervalTest.