Fix of a unit test of the last commit.

Additionally two minor changes.
This build should also FAIL.