Added infrastructure for testing.