Add reproduction of #16
Hmmh. backport missing test changes