Empty interval test fixes