Added more tests to cover non-interval cases