Add (disabled) regression tests for #64 and #66