AUI-1336 - Source formatting
AUI-1336 Add test case to unit test