AUI-1165 - source formatting
AUI-1165 - add unit tests