Fix test names to be more accurate