Rename now more generalized test