Adjust order of, and simplify CI tests