Fill in some holes in tests.