Reenabled config tests.
Merge branch 'little' into devel