Minor test code changes.