Bring the testing foundations in sync with each other.