Add test for VIM-569 fix