Changes to enable testing.