AUI-1738 Update unique field types when fields change
AUI-1738 Source formatting
AUI-1738 Increases test coverage