Restored test suite to a sane state.