Reverted test suite to Dr. Buffs.