Fix some regression tests