Adding in regression tests for #697