Fix bugs in regression tests