Minor refactoring of unit-test was done. Source code formatting was done.