Get tests to pass again.