[CDE-220] - Adding unit test for fix
[CDE-220] - Applying checkstyle to changed files