Fixed regression tests to keep up with recent changes.