Corrections to !393

My testing for !393 (merged) was bad and I tested what was on my laptop and not what was in the merge request.

Correcting that situation with the missing work from my laptop.

Also added some CI tests which would have at least caught this case however I am not fully happy with them, they are not wrong but could be better. See comments in .gitlab-ci.yaml file.

Also switched the validate job from cc7 to cs8 image.

One of the tests which allow_failure: true anyway only runs on master as a little expensive to run in feature branches. Have checked it however.