Add unit test requested in #1944