Merge "Modified settings tests to use custom test runner"