Reverting test suite to Dr. Buff's.