Merged in some config tests from Christof