added curr_test and next_test