Updates to get more tests running

These are job options updates to get some more tests running. I'm trying the "no template" option as well...

[skip ci]