Fix unit test with new kind delimiter
Merge pull request #853 from nlake44/fix-unit-tests

Fix unit test with new kind delimiter
Merge remote-tracking branch: upstream/master