Update tests to get them working again.