AUI-1288 - Source formatting
AUI-1288 - unit test