adapt some of the tests to new settings format