Fix copyright merge

There is an interesting (desired) side-effect of merging the copyright branch !123 (merged) into master: there are a few commits in master that are not compatible with the new stricture unit tests. This branch updates on this, and is a quick follow up of !123 (merged).