Add test case for MODE-2338