Add extra entry for spec test on the defaults files and normalize some others