changed test names to be much clearer
added some new tests
pulled 1 test back from previous version
Fixed delete self-referencing maintainer w/SSO credentials.
Merge branch 'master' into orgchange