SOC-4244: Add test case and correct code style