AUI-1364 - Source formatting
AUI-1364 - Test source formatting