More small changes to tests.