Revert "Changed disabled sections to test data race issues..."

This reverts commit 3680fe57385c986a0f47e525bf9e28d9a830fcd2.
It is just the ff section that appears to be the causing issue.
Changed order of operations around