Production settings (test); other changes