Update test names to be more generic