Update interval tests to reduce compile-time