Fix remaining two tests.