Alex/fix 971

THis PR fixes flaky acceptance tests. Not a 971 itself, but a falling test that was falling along the road to fix 971.