ZSS-665: fine tune test cases.