Revert "intermittent cost_control tests"

This reverts commit 570751acd66f0179eccc25f189834932bd95abd6.