Minor changes to tests find source of instability