Add a test for this functionality (requested by MN)