Update interval tests to reduce compile-time
Update interval tests to reduce compile-time