Several updates, so tests are running again.