Move settings into separate section in specs