Polish AutoConfigurationSorter
Reinstate integration tests