AUI-1561 Create unit test for remove
AUI-1561 Source formatting