Get tests passing again.