More changes to simplify testing.