Minor changes to accommodate testing.