Add profile completion tests for organization and make tests more robust
This refs affinitic #5910