Add additional support for testing.