Add a unit test repro for #556