Fix up settings schema and acceptance tests