Fixed some tests that failed last night.