Reorganized interval tests