Re-Sort config/names
Adjust test to match the expected results from master since the underlying data changed