Added some tests for #6499

Note that CS tests fail because of this intentional trailing space. Not sure yet about how to fix it.