failing test for #2007

failing test for #2007. Will spend some time to try and fix as well