Fixed the tests to account for new setting