Fixed regression tests