Fix tests.

#4458 

The two tests with the added ``@wip`` are dealt in #4461