Fixes regression tests