Refactor #5580: Refactor Hungary style code in test case