Also add a few related tests
enabled an automatic merge when the pipeline for dd48fc5b succeeds
merged
mentioned in commit 9b310bb4