.......... [DEV-532] improved test case naming, fixed comments