Removed all references to SwaDialog and fixed failing tests